* lisp/vc/diff.el (diff-sentinel): Go to bob.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e841a73e7095a2854e588bbd2d808611c24e3ec..06e9ef8567096d9e5f6b251a145cad6337048c9d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-04-27  Chong Yidong  <cyd@gnu.org>
 
+       * vc/diff.el (diff-sentinel): Go to bob (Bug#10259).
+
        * startup.el (x-apply-session-resources): New function.
 
        * term/ns-win.el (ns-initialize-window-system):

diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 2eefdee18365c5fa1d7f14a999ab47b181229190..6cfee52cbb5acfd1bc0938e19616cfa526eb21e1 100644 (file)
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -67,6 +67,7 @@ delete the temporary files so named."
   (if old-temp-file (delete-file old-temp-file))
   (if new-temp-file (delete-file new-temp-file))
   (diff-setup-whitespace)
+  (goto-char (point-min))
   (save-excursion
     (goto-char (point-max))
     (let ((inhibit-read-only t))